Merge from stable.

Tue Sep  2 21:01:19 2003  Kristian Rietveld  <kris@gtk.org>

	Merge from stable.

	* gtk/gtktreeview.c (gtk_tree_view_button_press): revert the change
	to only select when button 1 is pressed introduced in the fix of
	bug #120187.

diff --git a/ChangeLog b/ChangeLog
index b498a336e5bd35f3542496fd3a63abdc3695ffd0..6db564d14cd606563940d3507a08dfcd06b67f48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep  2 21:01:19 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): revert the change
+       to only select when button 1 is pressed introduced in the fix of
+       bug #120187.
+
 2003-09-02  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_new): Doc addition.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b498a336e5bd35f3542496fd3a63abdc3695ffd0..6db564d14cd606563940d3507a08dfcd06b67f48 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Sep  2 21:01:19 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): revert the change
+       to only select when button 1 is pressed introduced in the fix of
+       bug #120187.
+
 2003-09-02  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_new): Doc addition.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b498a336e5bd35f3542496fd3a63abdc3695ffd0..6db564d14cd606563940d3507a08dfcd06b67f48 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Sep  2 21:01:19 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): revert the change
+       to only select when button 1 is pressed introduced in the fix of
+       bug #120187.
+
 2003-09-02  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_new): Doc addition.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b498a336e5bd35f3542496fd3a63abdc3695ffd0..6db564d14cd606563940d3507a08dfcd06b67f48 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Sep  2 21:01:19 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): revert the change
+       to only select when button 1 is pressed introduced in the fix of
+       bug #120187.
+
 2003-09-02  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_new): Doc addition.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b498a336e5bd35f3542496fd3a63abdc3695ffd0..6db564d14cd606563940d3507a08dfcd06b67f48 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Sep  2 21:01:19 2003  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): revert the change
+       to only select when button 1 is pressed introduced in the fix of
+       bug #120187.
+
 2003-09-02  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_new): Doc addition.

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 297579dc9a7d82e3d45873a03ea0b2fbd09a92d4..18f9ac2a020a8d9c2fbb7417b17fbab7402f333f 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2141,10 +2141,9 @@ gtk_tree_view_button_press (GtkWidget      *widget,
       /* select */
       pre_val = tree_view->priv->vadjustment->value;
 
-      /* we only handle selection modifications from the first button on
-       * the first button press
+      /* we only handle selection modifications on the first button press
        */
-      if (event->type == GDK_BUTTON_PRESS && event->button == 1)
+      if (event->type == GDK_BUTTON_PRESS)
         {
           if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
             tree_view->priv->ctrl_pressed = TRUE;